GtkBuilder menus: reject all attributes on <item>
authorRyan Lortie <desrt@desrt.ca>
Tue, 31 Jan 2012 05:07:52 +0000 (00:07 -0500)
committerRyan Lortie <desrt@desrt.ca>
Tue, 31 Jan 2012 05:09:11 +0000 (00:09 -0500)
These were just being silently ignored before.  That's bad, since it
used to be valid to have these.

gtk/gtkbuilder-menus.c

index 5a32a4186c0dd4ec8ff45663d3f7bc947cd784a3..2bb03587d03ecee97e824a4eec2319c54517386f 100644 (file)
@@ -106,8 +106,12 @@ gtk_builder_menu_start_element (GMarkupParseContext  *context,
         {
           GMenuItem *item;
 
-          item = g_menu_item_new (NULL, NULL);
-          gtk_builder_menu_push_frame (state, NULL, item);
+          if (COLLECT (G_MARKUP_COLLECT_INVALID, NULL))
+            {
+              item = g_menu_item_new (NULL, NULL);
+              gtk_builder_menu_push_frame (state, NULL, item);
+            }
+
           return;
         }